Check for NULL detail and NULL widget.

Tue Jan 18 10:55:47 2005  Søren Sandmann  <sandmann@redhat.com>

	* gtk/gtkstyle.c (gtk_default_draw_handle): Check for NULL detail
	and NULL widget.

	* gtk/gtkstyle.c (gtk_default_draw_box): Check for NULL detail and
	NULL widget.  (#164477, Michael Natterer)

diff --git a/ChangeLog b/ChangeLog
index b0017dde57e06825d4ad944168a3afe0a49e228d..776a480e9a0a60020b3efa0adcf4c87e88546252 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jan 18 10:55:47 2005  Søren Sandmann  <sandmann@redhat.com>
+
+       * gtk/gtkstyle.c (gtk_default_draw_handle): Check for NULL detail
+       and NULL widget.
+
+       * gtk/gtkstyle.c (gtk_default_draw_box): Check for NULL detail and
+       NULL widget.  (#164477, Michael Natterer)
+
 2005-01-18  Matthias Clasen  <mclasen@redhat.com>
 
        Avoid X errors when running against servers which

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b0017dde57e06825d4ad944168a3afe0a49e228d..776a480e9a0a60020b3efa0adcf4c87e88546252 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Tue Jan 18 10:55:47 2005  Søren Sandmann  <sandmann@redhat.com>
+
+       * gtk/gtkstyle.c (gtk_default_draw_handle): Check for NULL detail
+       and NULL widget.
+
+       * gtk/gtkstyle.c (gtk_default_draw_box): Check for NULL detail and
+       NULL widget.  (#164477, Michael Natterer)
+
 2005-01-18  Matthias Clasen  <mclasen@redhat.com>
 
        Avoid X errors when running against servers which

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b0017dde57e06825d4ad944168a3afe0a49e228d..776a480e9a0a60020b3efa0adcf4c87e88546252 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Tue Jan 18 10:55:47 2005  Søren Sandmann  <sandmann@redhat.com>
+
+       * gtk/gtkstyle.c (gtk_default_draw_handle): Check for NULL detail
+       and NULL widget.
+
+       * gtk/gtkstyle.c (gtk_default_draw_box): Check for NULL detail and
+       NULL widget.  (#164477, Michael Natterer)
+
 2005-01-18  Matthias Clasen  <mclasen@redhat.com>
 
        Avoid X errors when running against servers which

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 691ee658026fe37571aea3bfd02b6086b8d82376..141977c23842106937e4564d01ef19a6afc5861c 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -3468,9 +3468,9 @@ gtk_default_draw_box (GtkStyle      *style,
     {
       GdkGC *gc = style->bg_gc[state_type];
       
-      if (state_type == GTK_STATE_SELECTED && strcmp (detail, "paned") == 0)
+      if (state_type == GTK_STATE_SELECTED && detail && strcmp (detail, "paned") == 0)
        {
-         if (!GTK_WIDGET_HAS_FOCUS (widget))
+         if (widget && !GTK_WIDGET_HAS_FOCUS (widget))
            gc = style->base_gc[GTK_STATE_ACTIVE];
        }
 
@@ -4877,13 +4877,13 @@ gtk_default_draw_handle (GtkStyle      *style,
                  detail, x, y, width, height);
   
   
-  if (!strcmp (detail, "paned"))
+  if (detail && !strcmp (detail, "paned"))
     {
       /* we want to ignore the shadow border in paned widgets */
       xthick = 0;
       ythick = 0;
 
-      if (state_type == GTK_STATE_SELECTED && !GTK_WIDGET_HAS_FOCUS (widget))
+      if (state_type == GTK_STATE_SELECTED && widget && !GTK_WIDGET_HAS_FOCUS (widget))
        {
          GdkColor unfocused_light;